Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sys/posix/include/arpa: use __restrict instead of restrict #18034

Merged
merged 1 commit into from
May 7, 2022
Merged

sys/posix/include/arpa: use __restrict instead of restrict #18034

merged 1 commit into from
May 7, 2022

Conversation

laurin
Copy link
Contributor

@laurin laurin commented Apr 28, 2022

Contribution description

Replace restrict with __restrict in sys/posix/include/arpa because the restrict keyword is not available in C++.
Resolves this error message:

<RIOTBASE>/sys/posix/include/arpa/inet.h:62:52: error: expected ‘,’ or ‘...’ before ‘src’
   62 | const char *inet_ntop(int af, const void *restrict src, char *restrict dst,
      |                                                    ^~~

Testing procedure

Green Murdock

@github-actions github-actions bot added the Area: sys Area: System label Apr 28, 2022
@benpicco benpicco added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Apr 29, 2022
@laurin laurin marked this pull request as draft April 29, 2022 12:22
@laurin laurin marked this pull request as ready for review April 29, 2022 12:22
@benpicco
Copy link
Contributor

benpicco commented May 2, 2022

Thank you for the patch!
CI is happy too.
Just one thing: please also prefix the commit message like you did with the pull request, so

sys/posix/include/arpa: use __restrict instead of restrict

or just

sys/posix: use __restrict instead of restrict

@laurin
Copy link
Contributor Author

laurin commented May 2, 2022

Ok, thanks for the heads up!

@maribu
Copy link
Member

maribu commented May 5, 2022

@laurin: ping. Only the commit message needs to be adapted to get this in ;)

@laurin laurin force-pushed the arpa-inet-restrict branch from 3dd1c0e to 550f5ea Compare May 7, 2022 14:10
@laurin
Copy link
Contributor Author

laurin commented May 7, 2022

@maribu Oh sorry, it's fixed now in 550f5ea

@benpicco benpicco enabled auto-merge May 7, 2022 14:42
@benpicco benpicco merged commit 6b0a105 into RIOT-OS:master May 7, 2022
@laurin laurin deleted the arpa-inet-restrict branch May 7, 2022 16:48
@chrysn chrysn added this to the Release 2022.07 milestone Aug 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benpicco benpicco benpicco approved these changes

Assignees
No one assigned
Labels
Area: sys Area: System CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR
Projects
None yet
Milestone
Release 2022.07
Development

Successfully merging this pull request may close these issues.
4 participants
@laurin @benpicco @maribu @chrysn